HighContrast: Fix selection in .views

Copy Adwaita fixes from 21a2fce8ba2a48fe3781e7a1f02b33e3a7bfd9ac.

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index c80a6d4ea3f8a85b7590609388cf276e081d5e19..5a0350bc5f0d583afbdf81c0f80775dd2112f5c0 100644 (file)
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -88,7 +88,6 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
   }
 }
 
-textview text,
 .view {
   color: $fg_color;
   background-color: $base_color;
@@ -96,26 +95,23 @@ textview text,
     color: $backdrop_fg_color;
     background-color: $backdrop_base_color;
   }
-  & selection,
-  & selection:focus,
-  & selection:hover {
-    @extend %selected_items;
-  }
+  &:selected,
+  &:selected:focus,
+  &:selected:hover { @extend %selected_items; }
 }
 
-iconview {
-  color: $fg_color;
-  background-color: $base_color;
-  &:backdrop {
-    color: $backdrop_fg_color;
-    background-color: $backdrop_base_color;
-  }
-  &:selected,
-  &:selected:focus {
+textview text {
+  @extend .view;
+
+  selection,
+  selection:focus,
+  selection:hover {
     @extend %selected_items;
   }
 }
 
+iconview { @extend .view ;}
+
 .rubberband,
 rubberband {
   border: 1px solid $selected_bg_color;

diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index d3f418689e302cc92c6a6d7904534f7882f2dedf..d485cfab6cbd80f505722f36cf49462743b139ea 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -4,16 +4,16 @@
 @define-color theme_base_color #111;
 @define-color theme_selected_bg_color #aaa;
 @define-color theme_selected_fg_color #fff;
-@define-color insensitive_bg_color #060606;
-@define-color insensitive_fg_color #7f7f7f;
+@define-color insensitive_bg_color #070707;
+@define-color insensitive_fg_color gray;
 @define-color insensitive_base_color #111;
 @define-color theme_unfocused_fg_color #fff;
 @define-color theme_unfocused_bg_color #000;
 @define-color theme_unfocused_base_color #111;
 @define-color theme_unfocused_selected_bg_color #aaa;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders #7f7f7f;
-@define-color unfocused_borders #727272;
+@define-color borders gray;
+@define-color unfocused_borders #737373;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -79,25 +79,16 @@
     background-color: black;
     color: #fff; }
   .gtkstyle-fallback:disabled {
-    background-color: #060606;
-    color: #7f7f7f; }
+    background-color: #070707;
+    color: gray; }
   .gtkstyle-fallback:selected {
     background-color: #aaa;
     color: #fff; }
 
-textview text,
-.view {
+.view, textview text, iconview {
   color: #fff;
   background-color: #111; }
-  textview text:backdrop,
-  .view:backdrop {
-    color: #fff;
-    background-color: #111; }
-
-iconview {
-  color: #fff;
-  background-color: #111; }
-  iconview:backdrop {
+  .view:backdrop, textview text:backdrop, iconview:backdrop {
     color: #fff;
     background-color: #111; }
 
@@ -115,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: #7f7f7f; }
+  color: gray; }
 
 /*********************
  * Spinner Animation *
@@ -144,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #080808; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px #090909; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #080808;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px #090909;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -160,14 +151,14 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
     border-color: #aaa;
-    box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
+    box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: #7f7f7f;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #060606);
+    color: gray;
+    border-color: gray;
+    background-image: linear-gradient(to bottom, #070707);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
     background-color: transparent;
@@ -180,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    color: #7f7f7f;
+    color: gray;
     background-image: linear-gradient(to bottom, #000);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -212,8 +203,8 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #090909, #111 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #080808;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px #090909;
     background-image: linear-gradient(to bottom, #111);
     border-bottom-color: #323232;
     box-shadow: none; }
@@ -224,16 +215,16 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      color: #7f7f7f;
-      border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #060606);
+      color: gray;
+      border-color: gray;
+      background-image: linear-gradient(to bottom, #070707);
       box-shadow: none;
       border-bottom-color: #323232; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
+        color: gray;
         background-image: linear-gradient(to bottom, #000);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
         border-bottom-color: #2e2e2e; }
@@ -249,29 +240,29 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #080808;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px #090909;
       border-bottom-color: #323232; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
         border-color: #aaa;
-        box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #2f2f2f; }
+        box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #303030; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #060606);
+        color: gray;
+        border-color: gray;
+        background-image: linear-gradient(to bottom, #070707);
         box-shadow: none;
         border-bottom-color: #2e2e2e; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
           border-bottom-color: #2e2e2e;
@@ -288,8 +279,8 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #080808;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px #090909;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #111);
       box-shadow: none; }
@@ -300,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #090909, #111 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #060606);
+        color: gray;
+        border-color: gray;
+        background-image: linear-gradient(to bottom, #070707);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #090909, #111 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #000);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -326,7 +317,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #360d0d; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #360e0e; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -337,7 +328,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #090909, #111 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #080808, inset 0 0 2px 1px #3e250d; }
+      box-shadow: inset 0 2px 2px -2px #090909, inset 0 0 2px 1px #3f260e; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -358,13 +349,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -373,14 +364,14 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -388,39 +379,39 @@ button {
       border-width: 2px;
       border-style: solid;
       color: black;
-      background-color: #727272;
-      border-color: #727272;
+      background-color: #737373;
+      border-color: #737373;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #737373;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #727272;
+      color: gray;
+      border-color: #737373;
       background-image: none;
       background-color: #090909; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #7f7f7f;
+    color: gray;
+    background-color: #070707;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: gray;
       background-image: none;
-      background-color: #060606; }
+      background-color: #070707; }
   .osd button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
@@ -449,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -486,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #737373;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -532,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #737373;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -561,13 +552,13 @@ button {
   color: #fff;
   background-image: none;
   background-color: #000;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -575,29 +566,29 @@ button {
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #7f7f7f;
+    color: gray;
+    background-color: #070707;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-image: none;
-    background-color: #060606; }
+    background-color: #070707; }
   .inline-toolbar toolbutton > button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -605,21 +596,21 @@ button {
     border-width: 2px;
     border-style: solid;
     color: black;
-    background-color: #727272;
-    border-color: #727272;
+    background-color: #737373;
+    border-color: #737373;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #727272;
+    color: gray;
+    background-color: #070707;
+    border-color: #737373;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #727272;
+    color: gray;
+    border-color: #737373;
     background-image: none;
     background-color: #090909; }
 
@@ -711,7 +702,7 @@ modelbutton.flat,
       background-color: #aaa; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: #7f7f7f; }
+    color: gray; }
 
 button.color {
   padding: 4px; }
@@ -754,7 +745,7 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(127, 127, 127, 0.3);
+    border-color: rgba(128, 128, 128, 0.3);
     color: #f3f3f3;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
@@ -770,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -779,7 +770,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(114, 114, 114, 0.3);
+      border-color: rgba(115, 115, 115, 0.3);
       background-color: #000;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -788,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -801,27 +792,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -830,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -840,27 +831,27 @@ spinbutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -869,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    background-color: #060606;
-    border-color: #727272;
+    color: gray;
+    background-color: #070707;
+    border-color: #737373;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -899,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #7f7f7f;
+    color: gray;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -907,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: #7f7f7f; }
+    color: gray; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -944,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   background-color: #262626;
-  box-shadow: inset 0 2px 3px -1px #5b5b5b; }
+  box-shadow: inset 0 2px 3px -1px #5c5c5c; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #727272;
-    background-color: #272727;
+    border-color: #737373;
+    background-color: #282828;
     box-shadow: none; }
 
 /***************
@@ -972,7 +963,7 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #0a0a0a, #000);
@@ -980,7 +971,7 @@ headerbar {
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #727272;
+    border-color: #737373;
     background-color: #000;
     background-image: none;
     box-shadow: none; }
@@ -994,7 +985,10 @@ headerbar {
     padding: 0 12px; }
   .titlebar > GtkBox > separator.vertical,
   headerbar > GtkBox > separator.vertical,
-  placessidebar .view headerbar > GtkBox > separator.vertical:backdrop {
+  placessidebar .view headerbar > GtkBox > separator.vertical:backdrop,
+  placessidebar textview text headerbar > GtkBox > separator.vertical:backdrop,
+  textview placessidebar text headerbar > GtkBox > separator.vertical:backdrop,
+  placessidebar iconview headerbar > GtkBox > separator.vertical:backdrop {
     border-width: 0 1px;
     border-color: #fff;
     border-style: solid; }
@@ -1032,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1053,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #737373;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1064,14 +1058,14 @@ headerbar {
         color: #fff;
         background-image: none;
         background-color: #000;
-        border-color: #7f7f7f; }
+        border-color: gray; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #7f7f7f;
+          border-color: gray;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1080,14 +1074,14 @@ headerbar {
           background-image: none;
           color: black;
           background-color: white;
-          border-color: #7f7f7f; }
+          border-color: gray; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #7f7f7f;
+          color: gray;
+          background-color: #070707;
+          border-color: gray;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1097,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #fff;
           background-color: #000;
-          border-color: #727272;
+          border-color: #737373;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1105,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #737373;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1155,44 +1149,44 @@ treeview.view {
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #d4d4d4;
+    border-left-color: #d5d5d5;
     border-top-color: rgba(255, 255, 255, 0.1); }
   treeview.view:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     treeview.view:disabled:selected {
       color: #cccccc; }
       treeview.view:disabled:selected:backdrop {
-        color: #d4d4d4; }
+        color: #d5d5d5; }
     treeview.view:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #fff;
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top: #000; }
   treeview.view.dnd {
     border-style: solid none;
     border-width: 1px;
-    border-color: #d4d4d4; }
+    border-color: #d5d5d5; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #b7b7b7; }
+    color: #b8b8b8; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #fff; }
     treeview.view.expander:selected {
-      color: #e5e5e5; }
+      color: #e6e6e6; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #e5e5e5; }
+        color: #e6e6e6; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #b7b7b7; }
+      color: #b8b8b8; }
   treeview.view.progressbar {
     color: #111;
     border: 1px solid #aaa;
@@ -1218,7 +1212,7 @@ treeview.view {
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #c3c3c3;
+      color: #c4c4c4;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1231,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: #7f7f7f;
+  border-color: gray;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #000;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: #7f7f7f;
+    border-color: gray;
     border-style: none solid solid none;
-    color: #7f7f7f;
+    color: gray;
     background-image: none;
     background-color: #111; }
     treeview.view header button:backdrop:disabled {
@@ -1249,7 +1243,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
 treeview.view.progressbar {
   color: #111;
   border-radius: 4px;
-  background-image: linear-gradient(to bottom, #aaa, #909090); }
+  background-image: linear-gradient(to bottom, #aaa, #919191); }
   treeview.view.progressbar:selected {
     color: #aaa;
     background-image: linear-gradient(to bottom, #111, black); }
@@ -1276,7 +1270,7 @@ menubar,
       color: #aaa; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #7f7f7f;
+      color: gray;
       box-shadow: none; }
 
 menu,
@@ -1284,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #111;
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1296,10 +1290,10 @@ menu,
       background-color: #aaa; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1332,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1340,11 +1334,17 @@ popover {
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   popover:backdrop {
     box-shadow: none; }
-  popover > .list, popover > .view, popover > toolbar, popover > searchbar {
+  popover > .list, popover > .view, textview popover > text, popover > iconview, popover > toolbar, popover > searchbar {
     background-color: transparent; }
-  popover separator, popover placessidebar .view separator, placessidebar .view popover separator,
+  popover separator, popover placessidebar .view separator, placessidebar .view popover separator, popover placessidebar textview text separator, placessidebar textview text popover separator, popover textview placessidebar text separator, textview placessidebar text popover separator, popover placessidebar iconview separator, placessidebar iconview popover separator,
   popover placessidebar .view separator:backdrop,
-  placessidebar .view popover separator:backdrop {
+  placessidebar .view popover separator:backdrop,
+  popover placessidebar textview text separator:backdrop,
+  placessidebar textview text popover separator:backdrop,
+  popover textview placessidebar text separator:backdrop,
+  textview placessidebar text popover separator:backdrop,
+  popover placessidebar iconview separator:backdrop,
+  placessidebar iconview popover separator:backdrop {
     color: #fff;
     background-color: transparent;
     border: 0; }
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid #7f7f7f;
+    border: 1px solid gray;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: #7f7f7f; }
+        color: gray; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #111; }
   notebook.frame {
-    border: 1px solid #7f7f7f; }
+    border: 1px solid gray; }
     notebook.frame:backdrop {
-      border-color: #727272; }
+      border-color: #737373; }
   notebook header {
     background-color: #262626; }
     .frame notebook header {
-      border: 1px solid #7f7f7f; }
+      border: 1px solid gray; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #727272; }
+        border-color: #737373; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #727272; }
+        box-shadow: inset 0 -1px #737373; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #727272; }
+        box-shadow: inset 0 1px #737373; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #727272; }
+        box-shadow: inset 1px 0 #737373; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #727272; }
+        box-shadow: inset -1px 0 #737373; }
     notebook header:backdrop {
-      background-color: #272727;
+      background-color: #282828;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: #7f7f7f; }
+      color: gray; }
       notebook header tabs arrow:hover {
-        color: #bfbfbf; }
+        color: silver; }
       notebook header tabs arrow:active {
         color: #fff; }
       notebook header tabs arrow:disabled {
-        color: rgba(127, 127, 127, 0.3); }
+        color: rgba(128, 128, 128, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(255, 255, 255, 0.4); }
   notebook header.top tab {
@@ -1481,7 +1481,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: #7f7f7f; }
+      border-color: gray; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #aaa; }
     notebook tab:backdrop {
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-bottom-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-bottom-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .top notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-bottom-color: #aaa; }
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-bottom-color: #aaa; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-top-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-top-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .bottom notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-top-color: #aaa; }
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-top-color: #aaa; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-right-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-right-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .left notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-right-color: #aaa; }
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-right-color: #aaa; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-left-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-left-color: gray;
         background-color: rgba(0, 0, 0, 0.2); }
       .right notebook tab.reorderable-page:active {
         background-color: rgba(0, 0, 0, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-left-color: #aaa; }
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(0, 0, 0, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #727272;
+          border-color: #737373;
           background-color: #000;
           border-left-color: #aaa; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,12 +1566,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #7f7f7f;
+      color: gray;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     notebook tab:hover label {
-      color: #bfbfbf; }
+      color: silver; }
     notebook tab:active label {
       color: #fff; }
       notebook tab:active label:backdrop {
@@ -1587,7 +1587,7 @@ notebook {
         border-style: solid;
         color: #fff;
         background-color: #000;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1598,7 +1598,7 @@ notebook {
         background-image: none;
         color: black;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(255, 255, 255, 0.3);
@@ -1626,11 +1626,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: #7f7f7f; }
+    background-color: gray; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #191919; }
+      background-color: #1a1a1a; }
     scrollbar slider:hover {
-      background-color: #b2b2b2; }
+      background-color: #b3b3b3; }
     scrollbar slider:hover:active {
       background-color: #aaa; }
     scrollbar slider.fine-tune {
@@ -1666,8 +1666,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: #7f7f7f;
-  background-color: #323232;
+  border-color: gray;
+  background-color: #333333;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1677,25 +1677,25 @@ switch {
     background-color: #aaa;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: #7f7f7f;
-    border-color: #7f7f7f;
-    background-color: #060606;
+    color: gray;
+    border-color: gray;
+    background-color: #070707;
     text-shadow: none; }
   switch:backdrop {
     color: #fff;
-    border-color: #727272;
+    border-color: #737373;
     background-color: #000;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #727272;
-      background-color: #727272;
+      border-color: #737373;
+      background-color: #737373;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
-      background-color: #060606;
-      color: #7f7f7f;
-      border-color: #7f7f7f; }
+      background-color: #070707;
+      color: gray;
+      border-color: gray; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1707,24 +1707,24 @@ switch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
+    border-color: gray;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #3f3f3f; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(0, 0, 0, 0.6), inset 0 -1px #404040; }
     switch slider:active {
       border-color: #aaa; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1733,18 +1733,18 @@ switch {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #727272; }
+        border-color: #737373; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #727272;
+        color: gray;
+        background-color: #070707;
+        border-color: #737373;
         background-image: none; }
 
 /*************************
@@ -1763,15 +1763,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     check:checked:backdrop, check:active:backdrop {
       color: #fff; }
   check:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     check:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1788,15 +1788,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #fff; }
   radio:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     radio:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1842,9 +1842,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-radius: 50%;
-    border-color: #777777; }
+    border-color: #787878; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1852,9 +1852,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      border-color: #777777;
+      border-color: #787878;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1868,7 +1868,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #6a6a6a;
+      border-color: #6b6b6b;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1876,9 +1876,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #737373;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1891,8 +1891,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #323232;
+    border-color: gray;
+    background-color: #333333;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1902,28 +1902,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: #7f7f7f;
-        background-color: #7f7f7f;
+        border-color: gray;
+        background-color: gray;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: #7f7f7f;
-      background-color: #060606; }
+      border-color: gray;
+      background-color: #070707; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #727272;
-      background-color: #3f3f3f;
+      border-color: #737373;
+      background-color: #404040;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: #000; }
 
 /*****************
@@ -1934,17 +1934,17 @@ progressbar {
   font-size: 83%;
   color: #fff; }
   progressbar:backdrop {
-    color: #7f7f7f; }
+    color: gray; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #2c2c2c;
+    border-color: gray;
+    background-color: #2d2d2d;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #727272;
-      background-color: #272727;
+      border-color: #737373;
+      background-color: #282828;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1981,8 +1981,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #090909, #111 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #080808; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px #090909; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2008,7 +2008,7 @@ levelbar block.filled.low {
 levelbar block.filled.high {
   border-width: 1px;
   border-style: solid;
-  border-color: #909090;
+  border-color: #919191;
   background-color: #aaa;
   box-shadow: 0 1px rgba(0, 0, 0, 0.1);
   border-radius: 1px; }
@@ -2030,28 +2030,26 @@ levelbar block.empty {
   levelbar block.empty:backdrop {
     border-color: rgba(255, 255, 255, 0.15); }
 
-textview text selection, textview text selection:focus, textview text selection:hover,
-.view selection,
-.view selection:focus,
-.view selection:hover, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, entry selection
+.view:selected, textview text:selected, iconview:selected, calendar:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, calendar:focus:selected, .view:selected:hover, textview text:selected:hover, iconview:selected:hover, calendar:hover:selected, textview text selection,
+textview text selection:focus,
+textview text selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, entry selection
 entry selection:focus, spinbutton selection
 entry selection:focus, entry selection
 spinbutton selection:focus, spinbutton selection
 spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
 .menuitem.button.flat:hover,
-.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected, placessidebar .view:selected, placessidebar calendar:selected {
+.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected, placessidebar .view:selected, placessidebar textview text:selected, textview placessidebar text:selected, placessidebar iconview:selected, placessidebar calendar:selected {
   background-color: #aaa;
   color: #fff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  textview text selection:backdrop,
-  .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection
+  .view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, calendar:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, calendar:backdrop:focus:selected, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, calendar:backdrop:hover:selected, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection
   entry selection:backdrop:focus, spinbutton selection
   entry selection:backdrop:focus, entry selection
   spinbutton selection:backdrop:focus, spinbutton selection
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: #7f7f7f;
+  .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
+    background-color: gray;
     color: #fff; }
 
 /**********
@@ -2059,19 +2057,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid #7f7f7f;
+  border: 1px solid gray;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #727272; }
+    border-color: #737373; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2082,7 +2080,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2091,7 +2089,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2100,7 +2098,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2109,7 +2107,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2118,7 +2116,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2127,7 +2125,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2136,7 +2134,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(255, 255, 255, 0.5)), to(rgba(255, 255, 255, 0)));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2145,7 +2143,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#727272), to(rgba(114, 114, 114, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#737373), to(rgba(115, 115, 115, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2208,9 +2206,12 @@ scrollbar scrolledwindow trough {
   scrollbar scrolledwindow trough:backdrop {
     background-color: transparent; }
 
-separator, placessidebar .view separator,
-placessidebar .view separator:backdrop {
-  background: #7f7f7f;
+separator, placessidebar .view separator, placessidebar textview text separator, textview placessidebar text separator, placessidebar iconview separator,
+placessidebar .view separator:backdrop,
+placessidebar textview text separator:backdrop,
+textview placessidebar text separator:backdrop,
+placessidebar iconview separator:backdrop {
+  background: gray;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2219,10 +2220,10 @@ placessidebar .view separator:backdrop {
  *********/
 list {
   background-color: #111;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   list:backdrop {
     background-color: #111;
-    border-color: #727272; }
+    border-color: #737373; }
   list row {
     padding: 2px; }
 
@@ -2243,7 +2244,7 @@ row.activatable:disabled:checked {
 row.activatable {
   color: #fff; }
   row.activatable:hover, placessidebar .has-open-popup {
-    background-color: #1c1c1c; }
+    background-color: #1d1d1d; }
   row.activatable:active {
     box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.2); }
   row.activatable:selected {
@@ -2252,9 +2253,9 @@ row.activatable {
     row.activatable:selected:active {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); }
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
-      background-color: #b2b2b2; }
+      background-color: #b3b3b3; }
     row.activatable:selected:backdrop {
-      background-color: #7f7f7f; }
+      background-color: gray; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2282,7 +2283,7 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, black 5%, black); }
   .app-notification .button,
@@ -2307,7 +2308,7 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   calendar.button {
     padding: 0 4px;
     color: #707070; }
@@ -2319,10 +2320,10 @@ calendar {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, #050505, black);
-    border-bottom-color: #3f3f3f; }
+    border-bottom-color: #404040; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #000);
-      border-bottom-color: #393939; }
+      border-bottom-color: #3a3a3a; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2348,13 +2349,13 @@ messagedialog.csd {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2362,13 +2363,13 @@ messagedialog.csd {
       background-image: none;
       color: black;
       background-color: white;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2377,16 +2378,16 @@ messagedialog.csd {
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #737373;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2421,16 +2422,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #737373;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2467,16 +2468,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
-          background-color: #060606;
-          border-color: #727272;
+          color: gray;
+          background-color: #070707;
+          border-color: #737373;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
-        background-color: #060606;
-        border-color: #7f7f7f;
+        color: gray;
+        background-color: #070707;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2490,9 +2491,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid #7f7f7f; }
+  border-top: 1px solid gray; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #727272; }
+    border-top-color: #737373; }
 
 /***********
  * Sidebar *
@@ -2502,10 +2503,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #000; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 placessidebar row {
   padding: 0px; }
@@ -2528,13 +2529,13 @@ placessidebar row {
       padding: 5px; }
     button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.9; }
-placessidebar .view {
+placessidebar .view, placessidebar textview text, textview placessidebar text, placessidebar iconview {
   color: #fff;
   background-color: transparent; }
-  placessidebar .view .image {
-    color: #b2b2b2; }
-    placessidebar .view .image:selected {
-      color: #f6f6f6; }
+  placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
+    color: #b3b3b3; }
+    placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
+      color: #f7f7f7; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2547,14 +2548,20 @@ stacksidebar row {
 /*********
  * Paned *
  *********/
-paned separator, paned placessidebar .view separator, placessidebar .view paned separator,
+paned separator, paned placessidebar .view separator, placessidebar .view paned separator, paned placessidebar textview text separator, placessidebar textview text paned separator, paned textview placessidebar text separator, textview placessidebar text paned separator, paned placessidebar iconview separator, placessidebar iconview paned separator,
 paned placessidebar .view separator:backdrop,
-placessidebar .view paned separator:backdrop {
+placessidebar .view paned separator:backdrop,
+paned placessidebar textview text separator:backdrop,
+placessidebar textview text paned separator:backdrop,
+paned textview placessidebar text separator:backdrop,
+textview placessidebar text paned separator:backdrop,
+paned placessidebar iconview separator:backdrop,
+placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, #7f7f7f); }
+  background-image: linear-gradient(to bottom, gray); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #727272); }
+    background-image: linear-gradient(to bottom, #737373); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2563,21 +2570,39 @@ paned:dir(rtl).horizontal separator {
   padding: 0 0 0 8px; }
 paned.vertical separator,
 paned.vertical placessidebar .view separator:backdrop,
-placessidebar .view paned.vertical separator:backdrop {
+placessidebar .view paned.vertical separator:backdrop,
+paned.vertical placessidebar textview text separator:backdrop,
+placessidebar textview text paned.vertical separator:backdrop,
+paned.vertical textview placessidebar text separator:backdrop,
+textview placessidebar text paned.vertical separator:backdrop,
+paned.vertical placessidebar iconview separator:backdrop,
+placessidebar iconview paned.vertical separator:backdrop {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0; }
 paned separator:selected,
 paned placessidebar .view separator:selected:backdrop,
-placessidebar .view paned separator:selected:backdrop {
+placessidebar .view paned separator:selected:backdrop,
+paned placessidebar textview text separator:selected:backdrop,
+placessidebar textview text paned separator:selected:backdrop,
+paned textview placessidebar text separator:selected:backdrop,
+textview placessidebar text paned separator:selected:backdrop,
+paned placessidebar iconview separator:selected:backdrop,
+placessidebar iconview paned separator:selected:backdrop {
   background-color: #aaa; }
 paned separator.wide,
 paned placessidebar .view separator.wide:backdrop,
-placessidebar .view paned separator.wide:backdrop {
+placessidebar .view paned separator.wide:backdrop,
+paned placessidebar textview text separator.wide:backdrop,
+placessidebar textview text paned separator.wide:backdrop,
+paned textview placessidebar text separator.wide:backdrop,
+textview placessidebar text paned separator.wide:backdrop,
+paned placessidebar iconview separator.wide:backdrop,
+placessidebar iconview paned separator.wide:backdrop {
   min-width: 5px;
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px; }
 
 /**************
@@ -2593,8 +2618,8 @@ infobar {
 .error {
   background-color: #aaa;
   color: #fff;
-  text-shadow: 0 1px #909090;
-  border-color: #909090; }
+  text-shadow: 0 1px #919191;
+  border-color: #919191; }
   .info button,
   .question button,
   .warning button,
@@ -2631,9 +2656,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #7f7f7f;
+      color: gray;
+      background-color: #070707;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2655,9 +2680,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      background-color: #060606;
-      border-color: #727272;
+      color: gray;
+      background-color: #070707;
+      border-color: #737373;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2759,20 +2784,20 @@ colorswatch {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #fff;
       background-color: #000;
-      border-color: #727272;
+      border-color: #737373;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2803,7 +2828,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #000;
-    border: solid 1px #727272;
+    border: solid 1px #737373;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2818,20 +2843,20 @@ button.titlebutton {
     color: #fff;
     background-image: none;
     background-color: #000;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: black;
     background-color: white;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #fff;
     background-color: #000;
-    border-color: #727272;
+    border-color: #737373;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2916,7 +2941,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }

diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 37f04d5bec5de9c4c508d151550205109a4218f4..590f31d02fa93d7cd1c7412e4f6334ba02f66e1a 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -5,15 +5,15 @@
 @define-color theme_selected_bg_color #000;
 @define-color theme_selected_fg_color #fff;
 @define-color insensitive_bg_color white;
-@define-color insensitive_fg_color #7f7f7f;
+@define-color insensitive_fg_color gray;
 @define-color insensitive_base_color #fff;
 @define-color theme_unfocused_fg_color #000;
 @define-color theme_unfocused_bg_color #fff;
 @define-color theme_unfocused_base_color #fff;
 @define-color theme_unfocused_selected_bg_color #000;
 @define-color theme_unfocused_selected_fg_color #fff;
-@define-color borders #7f7f7f;
-@define-color unfocused_borders #8b8b8b;
+@define-color borders gray;
+@define-color unfocused_borders #8d8d8d;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #73d216;
@@ -80,24 +80,15 @@
     color: #000; }
   .gtkstyle-fallback:disabled {
     background-color: white;
-    color: #7f7f7f; }
+    color: gray; }
   .gtkstyle-fallback:selected {
     background-color: #000;
     color: #fff; }
 
-textview text,
-.view {
+.view, textview text, iconview {
   color: #000;
   background-color: #fff; }
-  textview text:backdrop,
-  .view:backdrop {
-    color: #000;
-    background-color: #fff; }
-
-iconview {
-  color: #000;
-  background-color: #fff; }
-  iconview:backdrop {
+  .view:backdrop, textview text:backdrop, iconview:backdrop {
     color: #000;
     background-color: #fff; }
 
@@ -115,7 +106,7 @@ flowbox flowboxchild {
     outline-offset: -2px; }
 
 label:disabled, label:backdrop:disabled {
-  color: #7f7f7f; }
+  color: gray; }
 
 /*********************
  * Spinner Animation *
@@ -144,15 +135,15 @@ entry, spinbutton {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px gray; }
   entry.flat, entry.flat:focus, spinbutton.flat, spinbutton.flat:focus {
     padding: 2px;
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px gray;
     border: none;
     border-radius: 0; }
   entry:focus, spinbutton:focus {
@@ -160,13 +151,13 @@ entry, spinbutton {
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
     border-color: #000;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
+    box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
   entry:disabled, spinbutton:disabled {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-image: linear-gradient(to bottom, white);
     box-shadow: none; }
   entry:backdrop, spinbutton:backdrop {
@@ -180,7 +171,7 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    color: #7f7f7f;
+    color: gray;
     background-image: linear-gradient(to bottom, #fff);
     box-shadow: 0 1px rgba(255, 255, 255, 0); }
   entry selection, entry selection:backdrop, spinbutton selection, spinbutton selection:backdrop {
@@ -212,10 +203,10 @@ entry, spinbutton {
     background-color: transparent;
     border-style: solid;
     background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-    border-color: #7f7f7f;
-    box-shadow: inset 0 2px 2px -2px #7f7f7f;
+    border-color: gray;
+    box-shadow: inset 0 2px 2px -2px gray;
     background-image: linear-gradient(to bottom, #fff);
-    border-bottom-color: #d8d8d8;
+    border-bottom-color: #d9d9d9;
     box-shadow: none; }
     .linked.vertical entry:focus, .linked.vertical spinbutton:focus {
       border-color: #000;
@@ -224,19 +215,19 @@ entry, spinbutton {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: gray;
       background-image: linear-gradient(to bottom, white);
       box-shadow: none;
-      border-bottom-color: #d8d8d8; }
+      border-bottom-color: #d9d9d9; }
       .linked.vertical entry:disabled:backdrop, .linked.vertical spinbutton:disabled:backdrop {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
+        color: gray;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
     .linked.vertical entry:backdrop, .linked.vertical spinbutton:backdrop {
       background-color: transparent;
       border-style: solid;
@@ -244,37 +235,37 @@ entry, spinbutton {
       color: #000;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: 0 1px rgba(255, 255, 255, 0);
-      border-bottom-color: gainsboro; }
+      border-bottom-color: #dddddd; }
     .linked.vertical entry:first-child, .linked.vertical spinbutton:first-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f;
-      border-bottom-color: #d8d8d8; }
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px gray;
+      border-bottom-color: #d9d9d9; }
       .linked.vertical entry:first-child:focus, .linked.vertical spinbutton:first-child:focus {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
         border-color: #000;
-        box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #cccccc; }
+        box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #cccccc; }
       .linked.vertical entry:first-child:disabled, .linked.vertical spinbutton:first-child:disabled {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
+        color: gray;
+        border-color: gray;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none;
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
         .linked.vertical entry:first-child:disabled:backdrop, .linked.vertical spinbutton:first-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0);
-          border-bottom-color: gainsboro;
+          border-bottom-color: #dddddd;
           border-top-style: solid; }
       .linked.vertical entry:first-child:backdrop, .linked.vertical spinbutton:first-child:backdrop {
         background-color: transparent;
@@ -283,13 +274,13 @@ entry, spinbutton {
         color: #000;
         background-image: linear-gradient(to bottom, #fff);
         box-shadow: 0 1px rgba(255, 255, 255, 0);
-        border-bottom-color: gainsboro; }
+        border-bottom-color: #dddddd; }
     .linked.vertical entry:last-child, .linked.vertical spinbutton:last-child {
       background-color: transparent;
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-      border-color: #7f7f7f;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f;
+      border-color: gray;
+      box-shadow: inset 0 2px 2px -2px gray;
       border-top-width: 0;
       background-image: linear-gradient(to bottom, #fff);
       box-shadow: none; }
@@ -300,15 +291,15 @@ entry, spinbutton {
         background-color: transparent;
         border-style: solid;
         background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-        color: #7f7f7f;
-        border-color: #7f7f7f;
+        color: gray;
+        border-color: gray;
         background-image: linear-gradient(to bottom, white);
         box-shadow: none; }
         .linked.vertical entry:last-child:disabled:backdrop, .linked.vertical spinbutton:last-child:disabled:backdrop {
           background-color: transparent;
           border-style: solid;
           background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-          color: #7f7f7f;
+          color: gray;
           background-image: linear-gradient(to bottom, #fff);
           box-shadow: 0 1px rgba(255, 255, 255, 0); }
       .linked.vertical entry:last-child:backdrop, .linked.vertical spinbutton:last-child:backdrop {
@@ -326,7 +317,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #cc0000;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #f4cccc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #f5cccc; }
     entry.error:selected, entry.error:selected:focus, spinbutton.error:selected, spinbutton.error:selected:focus {
       background-color: #cc0000; }
   entry.warning, spinbutton.warning {
@@ -337,7 +328,7 @@ entry, spinbutton {
       border-style: solid;
       background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
       border-color: #f57900;
-      box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc; }
+      box-shadow: inset 0 2px 2px -2px gray, inset 0 0 2px 1px #fde4cc; }
     entry.warning:selected, entry.warning:selected:focus, spinbutton.warning:selected, spinbutton.warning:selected:focus {
       background-color: #f57900; }
 
@@ -358,13 +349,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   button:hover, button.flat:hover, button.sidebar-button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     -gtk-icon-effect: highlight; }
   button:active, button.flat:active, button.sidebar-button:active, button:checked, button.flat:checked, button.sidebar-button:checked {
@@ -373,14 +364,14 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f;
+    border-color: gray;
     transition-duration: 50ms; }
   button:backdrop, button.flat:backdrop, button.sidebar-button:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -388,37 +379,37 @@ button {
       border-width: 2px;
       border-style: solid;
       color: white;
-      background-color: #8b8b8b;
-      border-color: #8b8b8b;
+      background-color: #8d8d8d;
+      border-color: #8d8d8d;
       background-image: none; }
     button:backdrop:disabled, button.flat:backdrop:disabled, button.sidebar-button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     button:backdrop:disabled:active, button.flat:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #8b8b8b;
+      color: gray;
+      border-color: #8d8d8d;
       background-image: none;
-      background-color: whitesmoke; }
+      background-color: #f6f6f6; }
   button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
     button:disabled:active, button:disabled.flat:active, button.sidebar-button:disabled:active {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
-      border-color: #7f7f7f;
+      color: gray;
+      border-color: gray;
       background-image: none;
       background-color: white; }
   .osd button {
@@ -449,7 +440,7 @@ button {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .osd button:backdrop {
       border-width: 2px;
       border-style: solid; }
@@ -486,16 +477,16 @@ button {
       button.suggested-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
     button.suggested-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -532,16 +523,16 @@ button {
       button.destructive-action:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
     button.destructive-action:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -561,13 +552,13 @@ button {
   color: #000;
   background-image: none;
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   .inline-toolbar toolbutton > button:hover {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none; }
   .inline-toolbar toolbutton > button:active {
     border-width: 2px;
@@ -575,21 +566,21 @@ button {
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   .inline-toolbar toolbutton > button:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #7f7f7f;
+    border-color: gray;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-image: none;
     background-color: white; }
   .inline-toolbar toolbutton > button:backdrop {
@@ -597,7 +588,7 @@ button {
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
@@ -605,23 +596,23 @@ button {
     border-width: 2px;
     border-style: solid;
     color: white;
-    background-color: #8b8b8b;
-    border-color: #8b8b8b;
+    background-color: #8d8d8d;
+    border-color: #8d8d8d;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none; }
   .inline-toolbar toolbutton > button:backdrop:disabled:active {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
-    border-color: #8b8b8b;
+    color: gray;
+    border-color: #8d8d8d;
     background-image: none;
-    background-color: whitesmoke; }
+    background-color: #f6f6f6; }
 
 toolbar.inline-toolbar toolbutton > button.flat, searchbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, searchbar.inline-toolbar toolbutton > button.sidebar-button {
   border-radius: 0;
@@ -711,7 +702,7 @@ modelbutton.flat,
       background-color: #000; }
   modelbutton.flat:disabled,
   .menuitem.button.flat:disabled {
-    color: #7f7f7f; }
+    color: gray; }
 
 button.color {
   padding: 4px; }
@@ -754,8 +745,8 @@ spinbutton {
    */ }
   spinbutton button {
     background-image: none;
-    border-color: rgba(127, 127, 127, 0.3);
-    color: #0c0c0c;
+    border-color: rgba(128, 128, 128, 0.3);
+    color: #0d0d0d;
     border-radius: 0; }
     spinbutton button:dir(ltr) {
       border-style: none none none solid; }
@@ -770,7 +761,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:disabled:dir(ltr) {
         border-style: none none none solid; }
       spinbutton button:disabled:dir(rtl) {
@@ -779,7 +770,7 @@ spinbutton {
       box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2);
       background-color: rgba(0, 0, 0, 0.1); }
     spinbutton button:backdrop {
-      border-color: rgba(139, 139, 139, 0.3);
+      border-color: rgba(141, 141, 141, 0.3);
       background-color: #fff;
       box-shadow: none; }
       spinbutton button:backdrop:dir(ltr) {
@@ -788,7 +779,7 @@ spinbutton {
         border-style: none solid none none; }
     spinbutton button:backdrop:disabled {
       box-shadow: none;
-      color: rgba(127, 127, 127, 0.3); }
+      color: rgba(128, 128, 128, 0.3); }
       spinbutton button:backdrop:disabled:dir(rtl) {
         border-width: 0 1px 0 0; }
       spinbutton button:backdrop:disabled:dir(ltr) {
@@ -801,27 +792,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:first-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:first-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:first-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -830,7 +821,7 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -840,27 +831,27 @@ spinbutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     spinbutton.vertical button:last-child:active {
       border-width: 2px;
       border-style: solid;
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     spinbutton.vertical button:last-child:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     spinbutton.vertical button:last-child:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -869,16 +860,16 @@ spinbutton {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
   spinbutton.vertical button:backdrop:disabled {
     border-width: 2px;
     border-style: solid;
-    color: #7f7f7f;
+    color: gray;
     background-color: white;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none; }
   spinbutton.vertical.entry {
     border-radius: 0; }
@@ -899,7 +890,7 @@ combobox {
     padding-left: 8px;
     padding-right: 8px; }
   combobox:disabled {
-    color: #7f7f7f;
+    color: gray;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop {
@@ -907,7 +898,7 @@ combobox {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   combobox:backdrop:disabled {
-    color: #7f7f7f; }
+    color: gray; }
   combobox arrow {
     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
     min-height: 16px;
@@ -944,25 +935,25 @@ toolbar, searchbar {
     padding: 3px;
     border-radius: 0  0 4px 4px; }
   toolbar.vertical, searchbar.vertical {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     toolbar.vertical:dir(rtl), searchbar.vertical:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 searchbar {
   border-width: 0 0 1px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: none none solid none;
   padding: 3px; }
 
 toolbar.inline-toolbar, searchbar.inline-toolbar {
   border-style: solid;
-  border-color: #7f7f7f;
-  background-color: #d8d8d8;
-  box-shadow: inset 0 2px 3px -1px #a2a2a2; }
+  border-color: gray;
+  background-color: #d9d9d9;
+  box-shadow: inset 0 2px 3px -1px #a4a4a4; }
   toolbar.inline-toolbar:backdrop, searchbar.inline-toolbar:backdrop {
-    border-color: #8b8b8b;
-    background-color: #d6d6d6;
+    border-color: #8d8d8d;
+    background-color: #d7d7d7;
     box-shadow: none; }
 
 /***************
@@ -972,15 +963,15 @@ toolbar.inline-toolbar, searchbar.inline-toolbar {
 headerbar {
   border-width: 0 0 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, white, #fff);
-  box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #fff;
+  box-shadow: inset 0 -1px #d9d9d9, inset 0 1px #fff;
   padding: 6px; }
   .titlebar:backdrop,
   headerbar:backdrop {
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-color: #fff;
     background-image: none;
     box-shadow: none; }
@@ -994,7 +985,10 @@ headerbar {
     padding: 0 12px; }
   .titlebar > GtkBox > separator.vertical,
   headerbar > GtkBox > separator.vertical,
-  placessidebar .view headerbar > GtkBox > separator.vertical:backdrop {
+  placessidebar .view headerbar > GtkBox > separator.vertical:backdrop,
+  placessidebar textview text headerbar > GtkBox > separator.vertical:backdrop,
+  textview placessidebar text headerbar > GtkBox > separator.vertical:backdrop,
+  placessidebar iconview headerbar > GtkBox > separator.vertical:backdrop {
     border-width: 0 1px;
     border-color: #000;
     border-style: solid; }
@@ -1003,7 +997,7 @@ headerbar {
     color: black;
     text-shadow: 0 1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to bottom, #0d0d0d, #050505);
-    box-shadow: inset 0 -1px #d8d8d8, inset 0 1px #7f7f7f; }
+    box-shadow: inset 0 -1px #d9d9d9, inset 0 1px gray; }
     .titlebar.selection-mode button,
     headerbar.selection-mode button {
       border-width: 2px;
@@ -1032,9 +1026,9 @@ headerbar {
       headerbar.selection-mode button:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -1053,9 +1047,9 @@ headerbar {
       headerbar.selection-mode button:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
       .titlebar.selection-mode button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -1064,14 +1058,14 @@ headerbar {
         color: #000;
         background-image: none;
         background-color: #fff;
-        border-color: #7f7f7f; }
+        border-color: gray; }
         .titlebar.selection-mode button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
           border-width: 2px;
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #7f7f7f;
+          border-color: gray;
           background-image: none; }
         .titlebar.selection-mode button.suggested-action:active,
         headerbar.selection-mode button.suggested-action:active {
@@ -1080,14 +1074,14 @@ headerbar {
           background-image: none;
           color: white;
           background-color: black;
-          border-color: #7f7f7f; }
+          border-color: gray; }
         .titlebar.selection-mode button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #7f7f7f;
+          border-color: gray;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1097,7 +1091,7 @@ headerbar {
           border-style: solid;
           color: #000;
           background-color: #fff;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none;
           text-shadow: none;
           -gtk-icon-shadow: none; }
@@ -1105,9 +1099,9 @@ headerbar {
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
     .titlebar.selection-mode .selection-menu,
     headerbar.selection-mode .selection-menu {
@@ -1150,27 +1144,27 @@ treeview.view {
   -GtkTreeView-tree-line-width: 1;
   -GtkTreeView-tree-line-pattern: '';
   -GtkTreeView-expander-size: 16;
-  border-left-color: #7f7f7f;
+  border-left-color: gray;
   border-top-color: #fff; }
   treeview.view:selected {
     border-radius: 0; }
   treeview.view:selected, treeview.view:backdrop:selected {
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top-color: rgba(0, 0, 0, 0.1); }
   treeview.view:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     treeview.view:disabled:selected {
       color: #666666; }
       treeview.view:disabled:selected:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     treeview.view:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   treeview.view.separator:backdrop {
     min-height: 2px;
     color: rgba(0, 0, 0, 0.1); }
   treeview.view:backdrop {
     color: #000;
-    border-left-color: #7f7f7f;
+    border-left-color: gray;
     border-top: #fff; }
   treeview.view.dnd {
     border-style: solid none;
@@ -1178,21 +1172,21 @@ treeview.view {
     border-color: black; }
   treeview.view.expander {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-    color: #4c4c4c; }
+    color: #4d4d4d; }
     treeview.view.expander:dir(rtl) {
       -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
     treeview.view.expander:hover {
       color: #000; }
     treeview.view.expander:selected {
-      color: #b2b2b2; }
+      color: #b3b3b3; }
       treeview.view.expander:selected:hover {
         color: #fff; }
       treeview.view.expander:selected:backdrop {
-        color: #b2b2b2; }
+        color: #b3b3b3; }
     treeview.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     treeview.view.expander:backdrop {
-      color: #4c4c4c; }
+      color: #4d4d4d; }
   treeview.view.progressbar {
     color: #fff;
     border: 1px solid #000;
@@ -1213,12 +1207,12 @@ treeview.view {
       border-style: solid;
       border-color: #000; }
   treeview.view header button {
-    color: #7f7f7f;
+    color: gray;
     font-weight: bold;
     text-shadow: none;
     box-shadow: none; }
     treeview.view header button:hover {
-      color: #3f3f3f;
+      color: #404040;
       box-shadow: none; }
     treeview.view header button:active {
       color: #fff; }
@@ -1231,15 +1225,15 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
   border-radius: 0;
   border-width: 1px;
   background-image: none;
-  border-color: #7f7f7f;
+  border-color: gray;
   text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #fff;
     background-image: none; }
   treeview.view header button:backdrop {
-    border-color: #7f7f7f;
+    border-color: gray;
     border-style: none solid solid none;
-    color: #7f7f7f;
+    color: gray;
     background-image: none;
     background-color: #fff; }
     treeview.view header button:backdrop:disabled {
@@ -1276,7 +1270,7 @@ menubar,
       color: #000; }
     menubar > menuitem:disabled,
     .menubar > menuitem:disabled {
-      color: #7f7f7f;
+      color: gray;
       box-shadow: none; }
 
 menu,
@@ -1284,7 +1278,7 @@ menu,
   margin: 4px;
   padding: 0px;
   background-color: #fff;
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   menu menuitem,
   .menu menuitem {
     text-shadow: none;
@@ -1296,10 +1290,10 @@ menu,
       background-color: #000; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       menu menuitem:disabled:backdrop,
       .menu menuitem:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     menu menuitem:backdrop, menu menuitem:backdrop:hover,
     .menu menuitem:backdrop,
     .menu menuitem:backdrop:hover {
@@ -1332,7 +1326,7 @@ menuitem check, menuitem radio {
 popover {
   margin: 10px;
   padding: 2px;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px;
   border-style: solid;
   border-radius: 5px;
@@ -1340,11 +1334,17 @@ popover {
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   popover:backdrop {
     box-shadow: none; }
-  popover > .list, popover > .view, popover > toolbar, popover > searchbar {
+  popover > .list, popover > .view, textview popover > text, popover > iconview, popover > toolbar, popover > searchbar {
     background-color: transparent; }
-  popover separator, popover placessidebar .view separator, placessidebar .view popover separator,
+  popover separator, popover placessidebar .view separator, placessidebar .view popover separator, popover placessidebar textview text separator, placessidebar textview text popover separator, popover textview placessidebar text separator, textview placessidebar text popover separator, popover placessidebar iconview separator, placessidebar iconview popover separator,
   popover placessidebar .view separator:backdrop,
-  placessidebar .view popover separator:backdrop {
+  placessidebar .view popover separator:backdrop,
+  popover placessidebar textview text separator:backdrop,
+  placessidebar textview text popover separator:backdrop,
+  popover textview placessidebar text separator:backdrop,
+  textview placessidebar text popover separator:backdrop,
+  popover placessidebar iconview separator:backdrop,
+  placessidebar iconview popover separator:backdrop {
     color: #000;
     background-color: transparent;
     border: 0; }
@@ -1357,7 +1357,7 @@ popover {
   popover.magnifier, popover.osd {
     background-image: none;
     background-color: rgba(0, 0, 0, 0.8);
-    border: 1px solid #7f7f7f;
+    border: 1px solid gray;
     color: #fff; }
     popover.magnifier button, popover.osd button {
       color: white;
@@ -1387,7 +1387,7 @@ popover {
         border-width: 2px;
         border-style: solid;
         border-color: rgba(255, 255, 255, 0.2);
-        color: #7f7f7f; }
+        color: gray; }
 
 /*****************
  * Notebooks and *
@@ -1400,13 +1400,13 @@ notebook {
   notebook:backdrop {
     background-color: #fff; }
   notebook.frame {
-    border: 1px solid #7f7f7f; }
+    border: 1px solid gray; }
     notebook.frame:backdrop {
-      border-color: #8b8b8b; }
+      border-color: #8d8d8d; }
   notebook header {
-    background-color: #d8d8d8; }
+    background-color: #d9d9d9; }
     .frame notebook header {
-      border: 1px solid #7f7f7f; }
+      border: 1px solid gray; }
       .frame notebook header.top {
         border-bottom-width: 0; }
       .frame notebook header.bottom {
@@ -1416,34 +1416,34 @@ notebook {
       .frame notebook header.left {
         border-right-width: 0; }
       .frame notebook header:backdrop {
-        border-color: #8b8b8b; }
+        border-color: #8d8d8d; }
     notebook header.top {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 -1px gray; }
       notebook header.top:backdrop {
-        box-shadow: inset 0 -1px #8b8b8b; }
+        box-shadow: inset 0 -1px #8d8d8d; }
     notebook header.bottom {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 0 1px gray; }
       notebook header.bottom:backdrop {
-        box-shadow: inset 0 1px #8b8b8b; }
+        box-shadow: inset 0 1px #8d8d8d; }
     notebook header.right {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset 1px 0 gray; }
       notebook header.right:backdrop {
-        box-shadow: inset 1px 0 #8b8b8b; }
+        box-shadow: inset 1px 0 #8d8d8d; }
     notebook header.left {
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 #7f7f7f; }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.15), inset -1px 0 gray; }
       notebook header.left:backdrop {
-        box-shadow: inset -1px 0 #8b8b8b; }
+        box-shadow: inset -1px 0 #8d8d8d; }
     notebook header:backdrop {
-      background-color: #d6d6d6;
+      background-color: #d7d7d7;
       box-shadow: none; }
     notebook header tabs arrow {
-      color: #7f7f7f; }
+      color: gray; }
       notebook header tabs arrow:hover {
-        color: #3f3f3f; }
+        color: #404040; }
       notebook header tabs arrow:active {
         color: #000; }
       notebook header tabs arrow:disabled {
-        color: rgba(127, 127, 127, 0.3); }
+        color: rgba(128, 128, 128, 0.3); }
       notebook header tabs arrow:backdrop {
         color: rgba(0, 0, 0, 0.4); }
   notebook header.top tab {
@@ -1481,7 +1481,7 @@ notebook {
     background-color: transparent;
     outline-offset: 0; }
     notebook tab:hover {
-      border-color: #7f7f7f; }
+      border-color: gray; }
     notebook tab:active, notebook tab:backdrop:active {
       border-color: #000; }
     notebook tab:backdrop {
@@ -1490,17 +1490,17 @@ notebook {
     .top notebook tab.reorderable-page {
       border-color: transparent; }
       .top notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-bottom-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-bottom-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .top notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-bottom-color: #000; }
         .top notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .top notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-bottom-color: #000; }
       .top notebook tab.reorderable-page:backdrop {
@@ -1509,17 +1509,17 @@ notebook {
     .bottom notebook tab.reorderable-page {
       border-color: transparent; }
       .bottom notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-top-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-top-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .bottom notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-top-color: #000; }
         .bottom notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .bottom notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-top-color: #000; }
       .bottom notebook tab.reorderable-page:backdrop {
@@ -1528,17 +1528,17 @@ notebook {
     .left notebook tab.reorderable-page {
       border-color: transparent; }
       .left notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-right-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-right-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .left notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-right-color: #000; }
         .left notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .left notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-right-color: #000; }
       .left notebook tab.reorderable-page:backdrop {
@@ -1547,17 +1547,17 @@ notebook {
     .right notebook tab.reorderable-page {
       border-color: transparent; }
       .right notebook tab.reorderable-page:hover {
-        border-color: rgba(127, 127, 127, 0.3);
-        border-left-color: #7f7f7f;
+        border-color: rgba(128, 128, 128, 0.3);
+        border-left-color: gray;
         background-color: rgba(255, 255, 255, 0.2); }
       .right notebook tab.reorderable-page:active {
         background-color: rgba(255, 255, 255, 0.5);
-        border-color: rgba(127, 127, 127, 0.5);
+        border-color: rgba(128, 128, 128, 0.5);
         border-left-color: #000; }
         .right notebook tab.reorderable-page:active:hover {
           background-color: rgba(255, 255, 255, 0.7); }
         .right notebook tab.reorderable-page:active:backdrop {
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-color: #fff;
           border-left-color: #000; }
       .right notebook tab.reorderable-page:backdrop {
@@ -1566,12 +1566,12 @@ notebook {
     notebook tab label {
       padding: 0 2px;
       font-weight: bold;
-      color: #7f7f7f;
+      color: gray;
       /* color: inherit doesn't work here */ }
       notebook tab label:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     notebook tab:hover label {
-      color: #3f3f3f; }
+      color: #404040; }
     notebook tab:active label {
       color: #000; }
       notebook tab:active label:backdrop {
@@ -1587,7 +1587,7 @@ notebook {
         border-style: solid;
         color: #000;
         background-color: #fff;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         border-width: 2px;
         background-image: none;
@@ -1598,7 +1598,7 @@ notebook {
         background-image: none;
         color: white;
         background-color: black;
-        border-color: #7f7f7f;
+        border-color: gray;
         border-width: 2px; }
       notebook tab button:backdrop, notebook tab button:backdrop:hover {
         color: rgba(0, 0, 0, 0.3);
@@ -1626,11 +1626,11 @@ scrollbar {
   scrollbar slider {
     border-radius: 20px;
     border: 5px solid transparent;
-    background-color: #7f7f7f; }
+    background-color: gray; }
     scrollbar slider:backdrop, scrollbar slider:disabled {
-      background-color: #e5e5e5; }
+      background-color: #e6e6e6; }
     scrollbar slider:hover {
-      background-color: #4c4c4c; }
+      background-color: #4d4d4d; }
     scrollbar slider:hover:active {
       background-color: #000; }
     scrollbar slider.fine-tune {
@@ -1666,8 +1666,8 @@ switch {
   border-width: 1px;
   border-style: solid;
   border-radius: 3px;
-  border-color: #7f7f7f;
-  background-color: #cbcbcb;
+  border-color: gray;
+  background-color: #cccccc;
   box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
   /*outset not working*/
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
@@ -1677,25 +1677,25 @@ switch {
     background-color: #000;
     text-shadow: 0 0 2px white; }
   switch:disabled {
-    color: #7f7f7f;
-    border-color: #7f7f7f;
+    color: gray;
+    border-color: gray;
     background-color: white;
     text-shadow: none; }
   switch:backdrop {
     color: #000;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-color: #fff;
     box-shadow: none;
     text-shadow: none; }
     switch:backdrop:active {
       color: #fff;
-      border-color: #8b8b8b;
-      background-color: #8b8b8b;
+      border-color: #8d8d8d;
+      background-color: #8d8d8d;
       box-shadow: none; }
     switch:backdrop:disabled, switch:backdrop:disabled:active {
       background-color: white;
-      color: #7f7f7f;
-      border-color: #7f7f7f; }
+      color: gray;
+      border-color: gray; }
   switch slider {
     margin: -1px;
     min-width: 45px;
@@ -1707,24 +1707,24 @@ switch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f;
-    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
+    border-color: gray;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
     switch slider:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
+      box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px silver; }
     switch slider:active {
       border-color: #000; }
     switch slider:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -1733,18 +1733,18 @@ switch {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
       switch slider:backdrop:active {
-        border-color: #8b8b8b; }
+        border-color: #8d8d8d; }
       switch slider:backdrop:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #8b8b8b;
+        border-color: #8d8d8d;
         background-image: none; }
 
 /*************************
@@ -1763,15 +1763,15 @@ check {
   check:checked, check:active {
     -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
     check:checked:disabled, check:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       check:checked:disabled:backdrop, check:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     check:checked:backdrop, check:active:backdrop {
       color: #000; }
   check:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     check:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   check:indeterminate {
     -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
   check:backdrop {
@@ -1788,15 +1788,15 @@ radio {
   radio:checked, radio:active {
     -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
     radio:checked:disabled, radio:active:disabled {
-      color: #7f7f7f; }
+      color: gray; }
       radio:checked:disabled:backdrop, radio:active:disabled:backdrop {
-        color: #7f7f7f; }
+        color: gray; }
     radio:checked:backdrop, radio:active:backdrop {
       color: #000; }
   radio:disabled {
-    color: #7f7f7f; }
+    color: gray; }
     radio:disabled:backdrop {
-      color: #7f7f7f; }
+      color: gray; }
   radio:indeterminate {
     -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
   radio:backdrop {
@@ -1842,9 +1842,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f;
+    border-color: gray;
     border-radius: 50%;
-    border-color: #777777; }
+    border-color: #787878; }
     scale trough slider:hover,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:hover,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:hover {
@@ -1852,9 +1852,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
-      border-color: #777777;
+      border-color: #787878;
       border-radius: 50%; }
     scale trough slider:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:disabled,
@@ -1868,7 +1868,7 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop {
       border-style: solid;
       border-radius: 50%;
-      border-color: #838383;
+      border-color: #858585;
       background-image: none;
       box-shadow: none; }
     scale trough slider:backdrop:disabled,
@@ -1876,9 +1876,9 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough slider:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     scale trough slider:active,
     scale.scale-has-marks-above.scale-has-marks-below trough slider:active,
@@ -1891,8 +1891,8 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #cbcbcb;
+    border-color: gray;
+    background-color: #cccccc;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     scale trough.highlight,
     scale.scale-has-marks-above.scale-has-marks-below trough.highlight,
@@ -1902,28 +1902,28 @@ scale.vertical.scale-has-marks-above.scale-has-marks-below {
       scale trough.highlight:backdrop,
       scale.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop,
       scale.vertical.scale-has-marks-above.scale-has-marks-below trough.highlight:backdrop {
-        border-color: #7f7f7f;
-        background-color: #7f7f7f;
+        border-color: gray;
+        background-color: gray;
         box-shadow: none; }
     scale trough:disabled, scale trough.hilight:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough.hilight:disabled {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: white; }
     scale trough:backdrop,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop {
-      border-color: #8b8b8b;
-      background-color: #bfbfbf;
+      border-color: #8d8d8d;
+      background-color: silver;
       box-shadow: none; }
     scale trough:backdrop:disabled, scale trough .hilight:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough:backdrop:disabled,
     scale.vertical.scale-has-marks-above.scale-has-marks-below trough .hilight:backdrop:disabled {
-      border-color: #7f7f7f;
+      border-color: gray;
       background-color: #fff; }
 
 /*****************
@@ -1934,17 +1934,17 @@ progressbar {
   font-size: 83%;
   color: #000; }
   progressbar:backdrop {
-    color: #7f7f7f; }
+    color: gray; }
   progressbar trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    border-color: #7f7f7f;
-    background-color: #d2d2d2;
+    border-color: gray;
+    background-color: lightgray;
     box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); }
     progressbar trough:backdrop {
-      border-color: #8b8b8b;
-      background-color: #d6d6d6;
+      border-color: #8d8d8d;
+      background-color: #d7d7d7;
       box-shadow: 0 1px rgba(255, 255, 255, 0); }
   progressbar.osd trough {
     background-color: transparent;
@@ -1981,8 +1981,8 @@ levelbar trough {
   background-color: transparent;
   border-style: solid;
   background-image: linear-gradient(to bottom, #f7f7f7, #fff 90%);
-  border-color: #7f7f7f;
-  box-shadow: inset 0 2px 2px -2px #7f7f7f; }
+  border-color: gray;
+  box-shadow: inset 0 2px 2px -2px gray; }
   levelbar trough:backdrop {
     background-color: transparent;
     border-style: solid;
@@ -2030,28 +2030,26 @@ levelbar block.empty {
   levelbar block.empty:backdrop {
     border-color: rgba(0, 0, 0, 0.15); }
 
-textview text selection, textview text selection:focus, textview text selection:hover,
-.view selection,
-.view selection:focus,
-.view selection:hover, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, entry selection
+.view:selected, textview text:selected, iconview:selected, calendar:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, calendar:focus:selected, .view:selected:hover, textview text:selected:hover, iconview:selected:hover, calendar:hover:selected, textview text selection,
+textview text selection:focus,
+textview text selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, entry selection
 entry selection:focus, spinbutton selection
 entry selection:focus, entry selection
 spinbutton selection:focus, spinbutton selection
 spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
 .menuitem.button.flat:hover,
-.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected, placessidebar .view:selected, placessidebar calendar:selected {
+.menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected, placessidebar .view:selected, placessidebar textview text:selected, textview placessidebar text:selected, placessidebar iconview:selected, placessidebar calendar:selected {
   background-color: #000;
   color: #fff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  textview text selection:backdrop,
-  .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection
+  .view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, calendar:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, calendar:backdrop:focus:selected, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, calendar:backdrop:hover:selected, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection
   entry selection:backdrop:focus, spinbutton selection
   entry selection:backdrop:focus, entry selection
   spinbutton selection:backdrop:focus, spinbutton selection
   spinbutton selection:backdrop:focus, modelbutton.flat:backdrop:hover, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:hover,
-  .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected, placessidebar .view:backdrop:selected, placessidebar calendar:backdrop:selected {
-    background-color: #7f7f7f;
+  .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected {
+    background-color: gray;
     color: #fff; }
 
 /**********
@@ -2059,19 +2057,19 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
  **********/
 frame border,
 .frame {
-  border: 1px solid #7f7f7f;
+  border: 1px solid gray;
   padding: 0; }
   frame border.flat,
   .frame.flat {
     border-style: none; }
   frame border:backdrop,
   .frame:backdrop {
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
 
 actionbar box {
   padding: 6px;
   border-width: 1px 0 0;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-style: solid none none; }
 
 placessidebar .frame,
@@ -2082,7 +2080,7 @@ scrolledwindow viewport.frame {
   border-style: none; }
 placessidebar overshoot.top,
 scrolledwindow overshoot.top {
-  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center top;
@@ -2091,7 +2089,7 @@ scrolledwindow overshoot.top {
   box-shadow: none; }
   placessidebar overshoot.top:backdrop,
   scrolledwindow overshoot.top:backdrop {
-    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center top;
@@ -2100,7 +2098,7 @@ scrolledwindow overshoot.top {
     box-shadow: none; }
 placessidebar overshoot.bottom,
 scrolledwindow overshoot.bottom {
-  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 100% 5%, 100% 100%;
   background-repeat: no-repeat;
   background-position: center bottom;
@@ -2109,7 +2107,7 @@ scrolledwindow overshoot.bottom {
   box-shadow: none; }
   placessidebar overshoot.bottom:backdrop,
   scrolledwindow overshoot.bottom:backdrop {
-    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 100% 5%;
     background-repeat: no-repeat;
     background-position: center bottom;
@@ -2118,7 +2116,7 @@ scrolledwindow overshoot.bottom {
     box-shadow: none; }
 placessidebar overshoot.left,
 scrolledwindow overshoot.left {
-  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: left center;
@@ -2127,7 +2125,7 @@ scrolledwindow overshoot.left {
   box-shadow: none; }
   placessidebar overshoot.left:backdrop,
   scrolledwindow overshoot.left:backdrop {
-    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: left center;
@@ -2136,7 +2134,7 @@ scrolledwindow overshoot.left {
     box-shadow: none; }
 placessidebar overshoot.right,
 scrolledwindow overshoot.right {
-  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
+  background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#010101), to(rgba(1, 1, 1, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(0, 0, 0, 0.5)), to(transparent));
   background-size: 5% 100%, 100% 100%;
   background-repeat: no-repeat;
   background-position: right center;
@@ -2145,7 +2143,7 @@ scrolledwindow overshoot.right {
   box-shadow: none; }
   placessidebar overshoot.right:backdrop,
   scrolledwindow overshoot.right:backdrop {
-    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8b8b8b), to(rgba(139, 139, 139, 0)));
+    background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#8d8d8d), to(rgba(141, 141, 141, 0)));
     background-size: 5% 100%;
     background-repeat: no-repeat;
     background-position: right center;
@@ -2208,9 +2206,12 @@ scrollbar scrolledwindow trough {
   scrollbar scrolledwindow trough:backdrop {
     background-color: transparent; }
 
-separator, placessidebar .view separator,
-placessidebar .view separator:backdrop {
-  background: #7f7f7f;
+separator, placessidebar .view separator, placessidebar textview text separator, textview placessidebar text separator, placessidebar iconview separator,
+placessidebar .view separator:backdrop,
+placessidebar textview text separator:backdrop,
+textview placessidebar text separator:backdrop,
+placessidebar iconview separator:backdrop {
+  background: gray;
   min-width: 1px;
   min-height: 1px; }
 
@@ -2219,10 +2220,10 @@ placessidebar .view separator:backdrop {
  *********/
 list {
   background-color: #fff;
-  border-color: #7f7f7f; }
+  border-color: gray; }
   list:backdrop {
     background-color: #fff;
-    border-color: #8b8b8b; }
+    border-color: #8d8d8d; }
   list row {
     padding: 2px; }
 
@@ -2254,7 +2255,7 @@ row.activatable {
     row.activatable:selected:hover, placessidebar .has-open-popup:selected {
       background-color: black; }
     row.activatable:selected:backdrop {
-      background-color: #7f7f7f; }
+      background-color: gray; }
     row.activatable:selected .button.flat {
       color: #fff; }
       row.activatable:selected .button.flat:hover {
@@ -2282,9 +2283,9 @@ row.activatable {
   padding: 10px;
   border-width: 0 1px 1px;
   border-style: solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-radius: 0 0 6px 6px;
-  background-image: linear-gradient(to bottom, #efefef 5%, #f4f4f4); }
+  background-image: linear-gradient(to bottom, #f0f0f0 5%, whitesmoke); }
   .app-notification .button,
   .app-notification.frame .button {
     padding: 6px; }
@@ -2307,22 +2308,22 @@ expander arrow {
  * Calendar *
  ***********/
 calendar {
-  border: 1px solid #7f7f7f; }
+  border: 1px solid gray; }
   calendar.button {
     padding: 0 4px;
     color: #999999; }
     calendar.button:hover {
       color: #000; }
     calendar.button:backdrop, calendar.button:backdrop:hover {
-      color: #7f7f7f; }
+      color: gray; }
   calendar.view {
     border-radius: 2px; }
   calendar.header {
     background: linear-gradient(to bottom, white, #fafafa);
-    border-bottom-color: #bfbfbf; }
+    border-bottom-color: silver; }
     calendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
-      border-bottom-color: #c5c5c5; }
+      border-bottom-color: #c6c6c6; }
   calendar:indeterminate, calendar:indeterminate:backdrop {
     color: alpha(currentColor,0.55); }
   calendar.highlight, calendar.highlight:backdrop {
@@ -2348,13 +2349,13 @@ messagedialog.csd {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     messagedialog.csd .dialog-action-area button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     messagedialog.csd .dialog-action-area button:active {
       border-width: 2px;
@@ -2362,13 +2363,13 @@ messagedialog.csd {
       background-image: none;
       color: white;
       background-color: black;
-      border-color: #7f7f7f; }
+      border-color: gray; }
     messagedialog.csd .dialog-action-area button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2377,16 +2378,16 @@ messagedialog.csd {
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     messagedialog.csd .dialog-action-area button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
     messagedialog.csd .dialog-action-area button.suggested-action {
       border-width: 2px;
@@ -2421,16 +2422,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.suggested-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.suggested-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2467,16 +2468,16 @@ messagedialog.csd {
         messagedialog.csd .dialog-action-area button.destructive-action:backdrop:disabled {
           border-width: 2px;
           border-style: solid;
-          color: #7f7f7f;
+          color: gray;
           background-color: white;
-          border-color: #8b8b8b;
+          border-color: #8d8d8d;
           background-image: none; }
       messagedialog.csd .dialog-action-area button.destructive-action:disabled {
         border-width: 2px;
         border-style: solid;
-        color: #7f7f7f;
+        color: gray;
         background-color: white;
-        border-color: #7f7f7f;
+        border-color: gray;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
@@ -2490,9 +2491,9 @@ messagedialog.csd {
     border-bottom-left-radius: 7px; }
 
 GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid #7f7f7f; }
+  border-top: 1px solid gray; }
   GtkFileChooserDialog .dialog-action-box:backdrop {
-    border-top-color: #8b8b8b; }
+    border-top-color: #8d8d8d; }
 
 /***********
  * Sidebar *
@@ -2502,10 +2503,10 @@ GtkFileChooserDialog .dialog-action-box {
   .sidebar:backdrop {
     background-color: #fff; }
   .sidebar > scrolledwindow > .frame {
-    border-right: 1px solid #7f7f7f; }
+    border-right: 1px solid gray; }
     .sidebar > scrolledwindow > .frame:dir(rtl) {
       border-right: none;
-      border-left: 1px solid #7f7f7f; }
+      border-left: 1px solid gray; }
 
 placessidebar row {
   padding: 0px; }
@@ -2528,13 +2529,13 @@ placessidebar row {
       padding: 5px; }
     button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
       opacity: 0.9; }
-placessidebar .view {
+placessidebar .view, placessidebar textview text, textview placessidebar text, placessidebar iconview {
   color: #000;
   background-color: transparent; }
-  placessidebar .view .image {
-    color: #4c4c4c; }
-    placessidebar .view .image:selected {
-      color: #e5e5e5; }
+  placessidebar .view .image, placessidebar textview text .image, textview placessidebar text .image, placessidebar iconview .image {
+    color: #4d4d4d; }
+    placessidebar .view .image:selected, placessidebar textview text .image:selected, textview placessidebar text .image:selected, placessidebar iconview .image:selected {
+      color: #e6e6e6; }
 
 stacksidebar row {
   padding: 10px 4px; }
@@ -2547,14 +2548,20 @@ stacksidebar row {
 /*********
  * Paned *
  *********/
-paned separator, paned placessidebar .view separator, placessidebar .view paned separator,
+paned separator, paned placessidebar .view separator, placessidebar .view paned separator, paned placessidebar textview text separator, placessidebar textview text paned separator, paned textview placessidebar text separator, textview placessidebar text paned separator, paned placessidebar iconview separator, placessidebar iconview paned separator,
 paned placessidebar .view separator:backdrop,
-placessidebar .view paned separator:backdrop {
+placessidebar .view paned separator:backdrop,
+paned placessidebar textview text separator:backdrop,
+placessidebar textview text paned separator:backdrop,
+paned textview placessidebar text separator:backdrop,
+textview placessidebar text paned separator:backdrop,
+paned placessidebar iconview separator:backdrop,
+placessidebar iconview paned separator:backdrop {
   min-width: 1px;
   min-height: 1px;
-  background-image: linear-gradient(to bottom, #7f7f7f); }
+  background-image: linear-gradient(to bottom, gray); }
   paned separator:backdrop {
-    background-image: linear-gradient(to bottom, #8b8b8b); }
+    background-image: linear-gradient(to bottom, #8d8d8d); }
 paned:dir(ltr).horizontal separator {
   margin: 0 -8px 0 0;
   padding: 0 8px 0 0; }
@@ -2563,21 +2570,39 @@ paned:dir(rtl).horizontal separator {
   padding: 0 0 0 8px; }
 paned.vertical separator,
 paned.vertical placessidebar .view separator:backdrop,
-placessidebar .view paned.vertical separator:backdrop {
+placessidebar .view paned.vertical separator:backdrop,
+paned.vertical placessidebar textview text separator:backdrop,
+placessidebar textview text paned.vertical separator:backdrop,
+paned.vertical textview placessidebar text separator:backdrop,
+textview placessidebar text paned.vertical separator:backdrop,
+paned.vertical placessidebar iconview separator:backdrop,
+placessidebar iconview paned.vertical separator:backdrop {
   margin: 0 0 -8px 0;
   padding: 0 0 8px 0; }
 paned separator:selected,
 paned placessidebar .view separator:selected:backdrop,
-placessidebar .view paned separator:selected:backdrop {
+placessidebar .view paned separator:selected:backdrop,
+paned placessidebar textview text separator:selected:backdrop,
+placessidebar textview text paned separator:selected:backdrop,
+paned textview placessidebar text separator:selected:backdrop,
+textview placessidebar text paned separator:selected:backdrop,
+paned placessidebar iconview separator:selected:backdrop,
+placessidebar iconview paned separator:selected:backdrop {
   background-color: #000; }
 paned separator.wide,
 paned placessidebar .view separator.wide:backdrop,
-placessidebar .view paned separator.wide:backdrop {
+placessidebar .view paned separator.wide:backdrop,
+paned placessidebar textview text separator.wide:backdrop,
+placessidebar textview text paned separator.wide:backdrop,
+paned textview placessidebar text separator.wide:backdrop,
+textview placessidebar text paned separator.wide:backdrop,
+paned placessidebar iconview separator.wide:backdrop,
+placessidebar iconview paned separator.wide:backdrop {
   min-width: 5px;
   min-height: 5px;
   background-color: transparent;
   border-style: none solid;
-  border-color: #7f7f7f;
+  border-color: gray;
   border-width: 1px; }
 
 /**************
@@ -2631,9 +2656,9 @@ infobar {
     .error button:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2655,9 +2680,9 @@ infobar {
     .error button:backdrop:disabled {
       border-width: 2px;
       border-style: solid;
-      color: #7f7f7f;
+      color: gray;
       background-color: white;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none; }
   .info label:selected,
   .info label:selected:focus,
@@ -2759,20 +2784,20 @@ colorswatch {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
     colorswatch#add-color-button:hover {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #7f7f7f;
+      border-color: gray;
       background-image: none; }
     colorswatch#add-color-button:backdrop {
       border-width: 2px;
       border-style: solid;
       color: #000;
       background-color: #fff;
-      border-color: #8b8b8b;
+      border-color: #8d8d8d;
       background-image: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
@@ -2803,7 +2828,7 @@ decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #fff;
-    border: solid 1px #8b8b8b;
+    border: solid 1px #8d8d8d;
     box-shadow: none; }
 
 button.titlebutton {
@@ -2818,20 +2843,20 @@ button.titlebutton {
     color: #000;
     background-image: none;
     background-color: #fff;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:active {
     border-width: 2px;
     border-style: solid;
     background-image: none;
     color: white;
     background-color: black;
-    border-color: #7f7f7f; }
+    border-color: gray; }
   button.titlebutton:backdrop {
     border-width: 2px;
     border-style: solid;
     color: #000;
     background-color: #fff;
-    border-color: #8b8b8b;
+    border-color: #8d8d8d;
     background-image: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
@@ -2916,7 +2941,7 @@ cursor-handle {
       border-width: 2px;
       border-style: solid;
       border-color: rgba(255, 255, 255, 0.2);
-      color: #7f7f7f; }
+      color: gray; }
     .touch-selection button:backdrop {
       border-width: 2px;
       border-style: solid; }